-
Notifications
You must be signed in to change notification settings - Fork 3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Refactor wheel.move_wheel_files to use updated distlib #6763
Refactor wheel.move_wheel_files to use updated distlib #6763
Conversation
ceaf426
to
8b254c2
Compare
Thanks are probably more due to Vinay - I'm just the annoying git who nagged him about it. 😉 |
8b254c2
to
6339545
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
@xavfernandez If you're confident about these changes, feel free to merge them. :) |
Hello! I am an automated bot and I have noticed that this pull request is not currently able to be merged. If you are able to either merge the |
6339545
to
b0a7d2b
Compare
Gentle nudge. :) |
@chrahunt A git-workflow-related comment: It's much easier to review PRs when changes-with-changing-variable-names vs other changes happen in separate commits. This PR would've been easier to review if there were 2 separate commits:
|
752203b
to
f92961d
Compare
entry = e.args[0] | ||
raise InstallationError( | ||
"Invalid script entry point: {} for req: {} - A callable " | ||
"suffix is required. Cf https://packaging.python.org/en/" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Noting that we may want to re-wrap this text, so that the URL isn't wrapped.
This should probably get a NEWS file, since it's worth calling out as a |
With the recent update to distlib, we can rid ourselves of some workarounds in wheel.py.
Now we rely on the script template in distlib here.
The script template is essentially the same as the one that was in wheel.py before, with the exception of the regular expression here. For reference, our original regular expression was
(-script\.pyw?|\.exe)?$
and the new one is(-script\.pyw?|\.exe)?$
. In our case since distlib itself is generating the wrapper and only generates wrappers with names as-is (for Unix) and with .exe (for Windows), the-script.pyw
will never be applicable,?
not withstanding. This is further elaborated on here around the time of the original issue being raised.In a followup PR I should be able to extract and unit test the generation of the script spec generation.
Notes: